bitkeeper revision 1.1159.1.126 (413cb0edcNgU8KKUhhZaxIAIerLhcA)
authorcl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Mon, 6 Sep 2004 18:48:13 +0000 (18:48 +0000)
committercl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Mon, 6 Sep 2004 18:48:13 +0000 (18:48 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-nbsd

1  2 
xen/arch/x86/memory.c

Simple merge